Skip to content

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 26, 2023

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 26, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 26, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@lcnr lcnr force-pushed the alias-relate-coherence branch from 94b1506 to e7fa993 Compare May 26, 2023 09:00
@BoxyUwU
Copy link
Member

BoxyUwU commented May 26, 2023

r? @BoxyUwU @bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 26, 2023

📌 Commit b6b9611 has been approved by BoxyUwU

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 26, 2023
//
// As this is incomplete, we must not do so during coherence.
match (self.solver_mode(), subst_relate_response) {
(SolverMode::Normal, Ok(response)) => Ok(response),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its unfortunate that this means that improving try_merge_responses to not require floundering as much can break code because it could cause us to not take this path, and subst_relate_response can have a stronger response than the merged one :(

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 26, 2023
…yUwU

do not prefer substs relate during coherence

r? `@compiler-errors`
compiler-errors added a commit to compiler-errors/rust that referenced this pull request May 26, 2023
…yUwU

do not prefer substs relate during coherence

r? ``@compiler-errors``
bors added a commit to rust-lang-ci/rust that referenced this pull request May 26, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#111714 (Stop confusing specification levels when computing expectations.)
 - rust-lang#111927 (Migrate `item_static` to Askama)
 - rust-lang#111954 (improve error message for calling a method on a raw pointer with an unknown pointee)
 - rust-lang#111973 (Update current implementation comments for `select_nth_unstable`)
 - rust-lang#111976 (Generate docs for bootstrap itself)
 - rust-lang#111977 (Make errors from `x doc` less verbose)
 - rust-lang#111987 (do not prefer substs relate during coherence)
 - rust-lang#111991 (Change ty and const error's pretty printing to be in braces)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dfdbf1b into rust-lang:master May 27, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 27, 2023
@lcnr lcnr deleted the alias-relate-coherence branch May 28, 2023 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants